| commit | 7c73c663897cfb2796fa93efc40ebe4ea33a3db1 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junio@hera.kernel.org> | Fri Jan 19 00:37:50 2007 |
| committer | Junio C Hamano <junio@hera.kernel.org> | Fri Jan 19 00:37:50 2007 |
| tree | 1f9d377ee80bb9eada67fc063f87c517dffa8832 | |
| parent | 2d47c62a3df350dff294aba379e2a5430fd130d1 [diff] [blame] |
Autogenerated HTML docs for v1.5.0-rc1-g72fe
diff --git a/git-merge-file.html b/git-merge-file.html index e74295b..f5b6c94 100644 --- a/git-merge-file.html +++ b/git-merge-file.html
@@ -266,7 +266,7 @@ <h2>NAME</h2> <div class="sectionbody"> <p>git-merge-file - - three-way file merge + Run a three-way file merge </p> </div> </div> @@ -377,7 +377,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 17-Dec-2006 19:31:44 UTC +Last updated 19-Jan-2007 00:37:24 UTC </div> </div> </body>